[draft] [feat] add term command by baxen · Pull Request #5847 · block/goose

baxen · 2025-11-22T20:19:06Z

Term command is a new way to use goose without the builtin REPL

instead the session is tied right into your terminal

Type of Change

Feature

Term command is a new way to use goose without the builtin REPL - instead the session is tied right into your terminal

github-actions · 2025-11-22T20:22:01Z

PR Preview Action v1.6.0
Preview removed because the pull request was closed.
2025-11-27 01:29 UTC

Copilot

Pull request overview

This PR introduces a new goose term command that enables terminal-integrated sessions, allowing users to interact with goose directly from their shell prompt without entering a separate REPL. Each terminal maintains its own persistent session with shell command history awareness, so goose automatically sees what commands you've run when you ask questions.

Key changes:

New terminal integration command with shell-specific initialization scripts for bash, zsh, fish, and PowerShell
Database schema migration to v7 adding a shell_commands table to track command history
New CLI handlers for term init, term log, and term run subcommands

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 8 comments.

Show a summary per file

File	Description
documentation/docs/guides/terminal-integration.md	New documentation explaining terminal integration setup and usage
crates/goose/src/session/session_manager.rs	Database schema bump to v7, new shell_commands table with migration logic and query methods
crates/goose-cli/src/commands/term.rs	New command handlers for term init/log/run with shell script generation
crates/goose-cli/src/commands/mod.rs	Module declaration for new term command
crates/goose-cli/src/cli.rs	CLI integration with new Term command enum and shell type enum

Copilot · 2025-11-22T20:22:57Z

crates/goose-cli/src/commands/term.rs

+        "fish" => {
+            format!(
+                r#"set -gx GOOSE_TERMINAL_ID "{terminal_id}"
+alias gt='{goose_bin} term run'


Fish shell aliases don't support arguments like bash/zsh. Use alias gt '{goose_bin} term run' (function-style without =) or create a proper function instead.

Suggested change

alias gt='{goose_bin} term run'

function gt; {goose_bin} term run $argv; end

Copilot · 2025-11-22T20:22:57Z

crates/goose-cli/src/commands/term.rs

+function goose_preexec --on-event fish_preexec
+    string match -q -r '^goose term' -- $argv[1]; and return
+    string match -q -r '^gt ' -- $argv[1]; and return
+    {goose_bin} term log $argv[1] 2>/dev/null &


Missing quotes around $argv[1] in Fish shell. Commands with spaces or special characters will fail. Use {goose_bin} term log \"$argv[1]\" 2>/dev/null &

Suggested change

{goose_bin} term log $argv[1] 2>/dev/null &

{goose_bin} term log "$argv[1]" 2>/dev/null &

Copilot · 2025-11-22T20:22:57Z

crates/goose-cli/src/commands/term.rs

+        "powershell" | "pwsh" => {
+            format!(
+                r#"$env:GOOSE_TERMINAL_ID = "{terminal_id}"
+Set-Alias -Name gt -Value {{ {goose_bin} term run $args }}


PowerShell Set-Alias -Value doesn't accept scriptblocks with parameters. Use a function instead: function gt {{ & {goose_bin} term run @args }}

Suggested change

Set-Alias -Name gt -Value {{ {goose_bin} term run $args }}

function gt { {goose_bin} term run $args }

Copilot · 2025-11-22T20:22:57Z

crates/goose-cli/src/commands/term.rs

+        let session = SessionManager::create_session_with_id(
+            session_name.clone(),
+            working_dir.clone(),
+            session_name.clone(),
+            SessionType::User,
+        )
+        .await?;
+
+        SessionManager::update_session(&session.id)
+            .user_provided_name(session_name.clone())
+            .apply()
+            .await?;


Duplicated session creation logic appears in both handle_term_log (lines 110-121) and handle_term_run (lines 151-163). Extract to a helper function like ensure_terminal_session to reduce duplication.

Copilot · 2025-11-22T20:22:58Z

crates/goose-cli/src/commands/term.rs

+    [[ "$1" =~ ^goose\ term ]] && return
+    [[ "$1" =~ ^gt\  ]] && return


Regex pattern ^gt\ (line 28) requires gt followed by space but won't match standalone gt command. Should be ^gt(\s|$) or ^gt to handle both cases.

Copilot · 2025-11-22T20:22:58Z

crates/goose-cli/src/commands/term.rs

+    [[ "$1" =~ ^goose\ term ]] && return
+    [[ "$1" =~ ^gt\  ]] && return


Same issue as bash: regex pattern ^gt\ won't match standalone gt command. Should be ^gt(\s|$) or ^gt.

Copilot · 2025-11-22T20:22:58Z

crates/goose-cli/src/commands/term.rs

+# Log commands to goose
+function goose_preexec --on-event fish_preexec
+    string match -q -r '^goose term' -- $argv[1]; and return
+    string match -q -r '^gt ' -- $argv[1]; and return


Pattern ^gt requires space after gt but won't match standalone gt. Should be '^gt(\s|$)' or '^gt'.

Suggested change

string match -q -r '^gt ' -- $argv[1]; and return

string match -q -r '^gt(\\s|$)' -- $argv[1]; and return

Copilot · 2025-11-22T20:22:58Z

crates/goose-cli/src/commands/term.rs

+Set-PSReadLineKeyHandler -Chord Enter -ScriptBlock {{
+    $line = $null
+    [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$line, [ref]$null)
+    if ($line -notmatch '^goose term' -and $line -notmatch '^gt ') {{


Pattern ^gt won't match standalone gt command. Should be ^gt(\s|$) or ^gt\b.

angiejones · 2025-11-22T20:45:25Z

documentation/docs/guides/terminal-integration.md

+gt "what does this error mean?"
+```
+
+Goose responds, you read the answer, and you're back at your prompt. The conversation lives alongside your work, not in a separate window you have to manage.


Suggested change

Goose responds, you read the answer, and you're back at your prompt. The conversation lives alongside your work, not in a separate window you have to manage.

goose responds, you read the answer, and you're back at your prompt. The conversation lives alongside your work, not in a separate window you have to manage.

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.

Copilot · 2025-11-23T00:04:41Z

crates/goose-cli/src/commands/term.rs

+    $line = $null
+    [Microsoft.PowerShell.PSConsoleReadLine]::GetBufferState([ref]$line, [ref]$null)
+    if ($line -notmatch '^goose term' -and $line -notmatch '^gt ') {{
+        Start-Job -ScriptBlock {{ {goose_bin} term log $using:line }} | Out-Null


If the goose binary path contains spaces, this command will fail. Quote the path in PowerShell: & '{goose_bin}' term log $using:line

Suggested change

Start-Job -ScriptBlock {{ {goose_bin} term log $using:line }} | Out-Null

Start-Job -ScriptBlock {{ '{goose_bin}' term log $using:line }} | Out-Null

Copilot · 2025-11-23T00:04:41Z

crates/goose-cli/src/commands/term.rs

+goose_preexec() {{
+    [[ "$1" =~ ^goose\ term ]] && return
+    [[ "$1" =~ ^gt\  ]] && return
+    ("{goose_bin}" term log "$1" &) 2>/dev/null


If the goose binary path contains spaces, this command will fail. Quote the path: ("'${goose_bin}'" term log "$1" &) or use escaped quotes within the path variable itself.

Copilot · 2025-11-23T00:04:42Z

crates/goose-cli/src/commands/term.rs

+goose_preexec() {{
+    [[ "$1" =~ ^goose\ term ]] && return
+    [[ "$1" =~ ^gt\  ]] && return
+    ("{goose_bin}" term log "$1" &) 2>/dev/null


If the goose binary path contains spaces, this command will fail. Quote the path: ("'${goose_bin}'" term log "$1" &)

blackgirlbytes · 2025-11-23T00:16:04Z

documentation/docs/guides/terminal-integration.md

@@ -0,0 +1,75 @@
+# Terminal Integration
+
+The `goose term` commands let you talk to goose directly from your shell prompt. Instead of switching to a separate REPL session, you stay in your terminal and call goose when you need it.


This is such a cool feature, but since it's not released yet, can you make the document unlisted? We can remove it when it gets released.

The way you do that..is in the frontmatter write "unlisted: true"

blackgirlbytes · 2025-11-23T00:16:04Z

documentation/docs/guides/terminal-integration.md

@@ -0,0 +1,75 @@
+# Terminal Integration
+
+The `goose term` commands let you talk to goose directly from your shell prompt. Instead of switching to a separate REPL session, you stay in your terminal and call goose when you need it.


This is such a cool feature, but since it's not released yet, can you make the document unlisted? We can remove it when it gets released.

The way you do that..is in the frontmatter write "unlisted: true"

And noting to myself that we should have this mentioned in the CLI commands section

- Fix bash/zsh: properly quote goose binary path to handle spaces - Extract session creation logic to ensure_terminal_session helper - Reduces code duplication between handle_term_log and handle_term_run

Copilot

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated no new comments.

michaelneale · 2025-11-23T01:31:56Z

nice - I did note when I ran something which didn't involve a tool call, it didn't always return results... (ie ask "how are you") - if it uses a tool call seems all ok., but intermittent... digging in.

Also ...

command_not_found_handler() {
  local cmd="$*"
  gt "$cmd"
}

I added that to it and works well (even with the eval, automatically, if not too invasive!).

Very cool and innovative! (I also wonder if we could add a nice little oh my zsh like decoration to know goose is on)

I do think, somehow, dont' want each invocation to show up as a "term..." shell in the session history if possible?

michaelneale · 2025-11-23T01:43:50Z

crates/goose/src/session/session_manager.rs

 use utoipa::ToSchema;

-const CURRENT_SCHEMA_VERSION: i32 = 6;
+const CURRENT_SCHEMA_VERSION: i32 = 7;


I guess if we are changing the schema - we can make the term sessions not show up the usual way? (wonder if there is a less invasive way).

like having these term: specific sessions not show up in the history for things like the goose desktop? could do!

yeah - I have a PR that does that, Session::Hidden is fine.

michaelneale · 2025-11-23T01:45:37Z

crates/goose/src/session/session_manager.rs

        .await
    }
+
+    async fn add_shell_command(


I'm confused as to why we need to track these separately? as a special case?

this is used by the preexec hook so that goose actually gets a record of the commands that you ran by hand in your terminal between interactions with goose. could make this optional but i find it very useful to not have to tell it what i was doing

DOsinga

this seems pretty awesome!

I would prefer it if we can do this without making changes to the session manager. I don't think you need the create_with_session_id in this flow and I wonder if we can get the commands out of the sessions.

there's also a bunch of LLM-y comments in there that I could do without.

DOsinga · 2025-11-23T12:44:06Z

crates/goose-cli/src/commands/term.rs

+        .await
+        .is_err()
+    {
+        let session = SessionManager::create_session_with_id(


why do we need to create a session with a specific id, why not just use the name of the session here instead? or alternatively, we could create the session the first time and then write that session id to the config file; that way you wouldn't have to set the environment variable either

DOsinga · 2025-11-23T12:45:34Z

crates/goose-cli/src/commands/term.rs

+
+/// Handle `goose term init <shell>` - print shell initialization script
+pub fn handle_term_init(shell: &str) -> Result<()> {
+    let terminal_id = Uuid::new_v4().to_string();


actually you could just create the session here and then use the session id of that session as the terminal_id

DOsinga · 2025-11-23T12:47:25Z

crates/goose-cli/src/commands/term.rs

+    let session = SessionManager::get_session(&session_name, false).await.ok();
+    let total_tokens = session.as_ref().and_then(|s| s.total_tokens).unwrap_or(0) as usize;
+
+    let model_name = Config::global()


we store the model and provider now in the session - should probably get it from there

DOsinga · 2025-11-23T15:50:02Z

crates/goose-cli/src/commands/term.rs

+        }
+    };
+
+    let commands = SessionManager::get_shell_commands_since_last_message(&session_id).await?;


I'm not entirely sure I follow what we are fetching here. doesn't each session add at least one message to the conversation so isn't this then automatically empty?

in general though, adding shell commands to the session manager seems rather specific for this application. couldn't we just list the messages from session and exclude the <shell_history></shell_history> from that to get the same result? or if that doesn't work, maybe add a message content type?

michaelneale · 2025-11-24T00:09:49Z

my enhancements so far: #5852

michaelneale · 2025-11-24T00:57:46Z

ok @baxen @DOsinga #5852 - is my take, this doesn't change session manager, and makes sessions hidden type etc - but seems to work the same if you wan to try it? not sure if the approach for storing the terminal info is better/worse than putting it in sessions, but it is more isolated change.

michaelneale · 2025-11-27T01:28:41Z

all of this has been pulled over here: #5887

[feat] add term command

c345c82

Term command is a new way to use goose without the builtin REPL - instead the session is tied right into your terminal

Copilot AI review requested due to automatic review settings November 22, 2025 20:19

baxen requested a review from a team as a code owner November 22, 2025 20:19

Copilot started reviewing on behalf of baxen November 22, 2025 20:19 View session

Copilot finished reviewing on behalf of baxen November 22, 2025 20:21

Copilot AI reviewed Nov 22, 2025

View reviewed changes

angiejones reviewed Nov 22, 2025

View reviewed changes

baxen added 2 commits November 22, 2025 15:48

add info command for prompt integration

6cb829f

break up migration function for clippy

f36f678

Copilot AI review requested due to automatic review settings November 23, 2025 00:00

Copilot started reviewing on behalf of baxen November 23, 2025 00:00 View session

Copilot finished reviewing on behalf of baxen November 23, 2025 00:03

Copilot AI reviewed Nov 23, 2025

View reviewed changes

comments

3b9d53b

blackgirlbytes requested changes Nov 23, 2025

View reviewed changes

baxen added 2 commits November 22, 2025 16:17

Address remaining PR comments

5b768e5

- Fix bash/zsh: properly quote goose binary path to handle spaces - Extract session creation logic to ensure_terminal_session helper - Reduces code duplication between handle_term_log and handle_term_run

unlist

155e086

baxen requested review from blackgirlbytes and Copilot November 23, 2025 00:23

Copilot started reviewing on behalf of baxen November 23, 2025 00:24 View session

Copilot finished reviewing on behalf of baxen November 23, 2025 00:25

Copilot AI reviewed Nov 23, 2025

View reviewed changes

blackgirlbytes approved these changes Nov 23, 2025

View reviewed changes

michaelneale reviewed Nov 23, 2025

View reviewed changes

DOsinga approved these changes Nov 23, 2025

View reviewed changes

michaelneale mentioned this pull request Nov 24, 2025

Terminal Theme or Mode #5802

Closed

1 task

michaelneale mentioned this pull request Nov 24, 2025

feat: enhancing new terminal feature #5852

Closed

michaelneale mentioned this pull request Nov 25, 2025

ignore (test): Goose in terminal #5869

Closed

michaelneale closed this Nov 27, 2025

	alias gt='{goose_bin} term run'
	function gt; {goose_bin} term run $argv; end

	{goose_bin} term log $argv[1] 2>/dev/null &
	{goose_bin} term log "$argv[1]" 2>/dev/null &

	Set-Alias -Name gt -Value {{ {goose_bin} term run $args }}
	function gt { {goose_bin} term run $args }

		[[ "$1" =~ ^goose\ term ]] && return
		[[ "$1" =~ ^gt\ ]] && return

	string match -q -r '^gt ' -- $argv[1]; and return
	string match -q -r '^gt(\\s\|$)' -- $argv[1]; and return

	Goose responds, you read the answer, and you're back at your prompt. The conversation lives alongside your work, not in a separate window you have to manage.
	goose responds, you read the answer, and you're back at your prompt. The conversation lives alongside your work, not in a separate window you have to manage.

	Start-Job -ScriptBlock {{ {goose_bin} term log $using:line }} \| Out-Null
	Start-Job -ScriptBlock {{ '{goose_bin}' term log $using:line }} \| Out-Null

		@@ -0,0 +1,75 @@
		# Terminal Integration

		The `goose term` commands let you talk to goose directly from your shell prompt. Instead of switching to a separate REPL session, you stay in your terminal and call goose when you need it.

Conversation

baxen commented Nov 22, 2025

Type of Change

Uh oh!

github-actions bot commented Nov 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 22, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Nov 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 23, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Nov 23, 2025

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

michaelneale commented Nov 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DOsinga left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

github-actions bot commented Nov 22, 2025 •

edited

Loading

michaelneale commented Nov 23, 2025 •

edited

Loading

michaelneale commented Nov 24, 2025 •

edited

Loading